Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <[email protected]>
Wed, 14 Jun 2017 22:52:49 +0000 (18:52 -0400)
committerTom Rini <[email protected]>
Wed, 14 Jun 2017 22:52:49 +0000 (18:52 -0400)

Trivial merge